From f6fd0fd9b9042f914f331691b4433c655edbe2bb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 28 Feb 2017 09:45:08 -0800 Subject: [PATCH] Prefer CARGO_PKG_* in version info These are always set by Cargo and avoids rustbuild-building-cargo to need to parse semver --- src/cargo/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index a844359e7..1d13a5033 100755 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -252,10 +252,10 @@ pub fn version() -> VersionInfo { } }); VersionInfo { - major: option_env_str!("CFG_VERSION_MAJOR").unwrap(), - minor: option_env_str!("CFG_VERSION_MINOR").unwrap(), - patch: option_env_str!("CFG_VERSION_PATCH").unwrap(), - pre_release: option_env_str!("CFG_PRERELEASE_VERSION"), + major: env_str!("CARGO_PKG_VERSION_MAJOR"), + minor: env_str!("CARGO_PKG_VERSION_MINOR"), + patch: env_str!("CARGO_PKG_VERSION_PATCH"), + pre_release: option_env_str!("CARGO_PKG_VERSION_PRE"), cfg_info: Some(CfgInfo { build_date: option_env_str!("CFG_BUILD_DATE").unwrap(), release_channel: option_env_str!("CFG_RELEASE_CHANNEL").unwrap(), -- 2.30.2